nani/app

Julien LepillerWed Jun 10 04:06:01+0200 2020

53426a6

Pass dictionary name instead of unstable position in list

app/src/main/java/eu/lepiller/nani/DictionaryActivity.java

             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 Intent intent = new Intent(DictionaryActivity.this, DictionaryDownloadActivity.class);
                 intent.putExtra("dico", position);
                 intent.putExtra(DictionaryDownloadActivity.EXTRA_DICTIONARY, DictionaryFactory.get(position).getName());
                 startActivityForResult(intent, DICO_REQUEST);
             }
         });
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == DICO_REQUEST) {
             DictionaryFactory.updatePackageList();
             adapter.notifyDataSetChanged();
         }
     }

app/src/main/java/eu/lepiller/nani/DictionaryDownloadActivity.java

 public class DictionaryDownloadActivity extends AppCompatActivity {
     final static String TAG = "DWN";
     final static int notificationID = 1111;
     final static String EXTRA_DICTIONARY = "eu.lepiller.nani.extra.DICTIONARY";
     Dictionary d;
     DownloadTask currentDownloadTask = null;
         setContentView(R.layout.activity_dictionary_download);
         Bundle extras = getIntent().getExtras();
         // TODO: this will open the first dictionary on error, we probably want to display a proper
         // error instead.
         int position = 0;
         String name = null;
         if(extras != null)
             position = extras.getInt("dico");
             name = extras.getString(EXTRA_DICTIONARY);
         d = DictionaryFactory.get(position);
         d = DictionaryFactory.getByName(this, name);
         manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
         builder =  new NotificationCompat.Builder(DictionaryDownloadActivity.this, "dico_dll")

app/src/main/java/eu/lepiller/nani/dictionary/DictionaryFactory.java

             instance = new DictionaryFactory(context);
     }
     public static Dictionary getByName(Context context, String name) {
         prepare(context);
         for(Dictionary d: dictionaries) {
             if (d.getName().equals(name))
                 return d;
         }
         return null;
     }
     public static ArrayList<Result> search(String text) throws DictionaryException {
         if(instance == null)
             throw new NoDictionaryException();